Note

Low Risk
Scoped to PR thread preparation error reporting and contracts; behavior on success is unchanged, with clearer failure diagnostics on dual-fetch errors.

Overview
When preparing a PR worktree thread, both the repository-head fetch and the pull-request-ref fallback can fail; callers now get a single GitPullRequestMaterializationError instead of only the fallback GitCommandError.

The new contract error carries cwd, PR number, head repo/branch, and local branch name, with an AggregateError cause that lists both underlying git failures (primary as cause.cause). GitManagerServiceError includes this type so UI/RPC can pattern-match it.

Related logging in upstream configuration and setup-script failures is switched to structured Effect.logWarning payloads rather than interpolated strings.

^{Reviewed by Cursor Bugbot for commit 4734fe1. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Preserve both branch materialization failures in GitPullRequestMaterializationError

• Adds GitPullRequestMaterializationError to packages/contracts/src/git.ts, a structured error carrying cwd, pullRequestNumber, headRepository, headBranch, localBranch, and a cause field.
• When both the primary head branch fetch and the fallback fetchPullRequestBranch fail in materializePullRequestHeadBranch, the error now wraps both failures in an AggregateError (with primaryCause as its own cause) rather than surfacing only the fallback error.
• Replaces string-interpolated warning logs with structured Effect.logWarning calls in configurePullRequestHeadUpstream and preparePullRequestThread.
• Adds a test in apps/server/src/git/GitManager.test.ts asserting that both GitCommandError instances are preserved in the AggregateError cause chain.
• Behavioral Change: GitManagerServiceError now includes GitPullRequestMaterializationError; consumers that pattern-match this union need to handle the new variant.

^{Macroscope summarized 4734fe1.}